clang-tidy readability-implicit-bool-conversion on gui.

diff --git a/gui/filterdata.cc b/gui/filterdata.cc
index fb96fc5fb7e6a474abb0eb7a1bb7859d1c6a0511..5652c8fea7069464023758a8b5022098374cec1c 100644 (file)
--- a/gui/filterdata.cc
+++ b/gui/filterdata.cc
@@ -35,7 +35,7 @@ QStringList WayPtsFilterData::makeOptionString()
     args << QString("radius,distance=%1%2,lat=%3,lon=%4")
          .arg(radiusVal).arg("MK"[radiusUnit]).arg(latVal, 0, 'f', 8).arg(longVal, 0, 'f', 8);
   }
-  if (duplicates && (shortNames ^ locations)) {
+  if (duplicates && ((shortNames ^ locations) != 0)) {
     args << QString("-x");
     QString s = "duplicate";
     if (shortNames) {
@@ -142,7 +142,7 @@ QStringList TrackFilterData::makeOptionString()
     s += QString(",title=%1").arg(titleString);
   }
 
-  if (s.length()) {
+  if (s.length() != 0) {
     args << "-x" << "track" + s;
   }
 

diff --git a/gui/filterdlg.cc b/gui/filterdlg.cc
index 605eb83479e7fd03d5af8286d3262f33d9eb04ea..ca20c3ff20867a0413484023640ad3179431ff00 100644 (file)
--- a/gui/filterdlg.cc
+++ b/gui/filterdlg.cc
@@ -125,7 +125,7 @@ void FilterDialog::helpX()
 //------------------------------------------------------------------------
 void FilterDialog::runDialog()
 {
-  if (exec()) {
+  if (exec() != 0) {
     for (int i=0; i<pages_.size(); i++) {
       pages_[i]->getWidgetValues();
       *(usePages_[i]) = ui_.filterList->item(i)->checkState() == Qt::Checked;

diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
index 3ff7fa4afd435c6f058be5c8a4d0bc9951540eca..26490c7aca4bee08da6879ab46795aea7afd69bc 100644 (file)
--- a/gui/mainwindow.cc
+++ b/gui/mainwindow.cc
@@ -120,7 +120,7 @@ static QString MakeOptions(const QList<FormatOption>& options)
 static QString MakeOptionsNoLeadingComma(const QList<FormatOption>& options)
 {
   QString str = MakeOptions(options);
-  return (str.length()) ? str.mid(1) : str;
+  return (str.length()) != 0 ? str.mid(1) : str;
 
 }
 

diff --git a/gui/map.cc b/gui/map.cc
index ea9c84ec22d20fb78d3d3a3e43b83e2d6dc5f7ff..818c5ca30a44d7d9b625555a76875c5d11eef834 100644 (file)
--- a/gui/map.cc
+++ b/gui/map.cc
@@ -301,7 +301,7 @@ void Map::markerClicked(int t, int i)
 void Map::logTime(const QString& s)
 {
   //  fprintf(stderr, "Log: %s:  %d ms\n", s.toStdString().c_str(), stopWatch.elapsed());
-  if (textEdit_) {
+  if (textEdit_ != nullptr) {
     textEdit_->appendPlainText(QString("%1: %2 ms").arg(s).arg(stopWatch_.elapsed()));
   }
   stopWatch_.start();

diff --git a/gui/optionsdlg.cc b/gui/optionsdlg.cc
index 546d544344c7853e8ec45645728446aa3531b2e5..10df747cc2c674d59299204839385574b44aeedc 100644 (file)
--- a/gui/optionsdlg.cc
+++ b/gui/optionsdlg.cc
@@ -222,7 +222,7 @@ void OptionsDlg::acceptClicked()
 {
   for (int k=0; k<options_.size(); k++) {
     options_[k].setSelected(checkBoxes_[k]->isChecked());
-    if (fields_[k]) {
+    if (fields_[k] != nullptr) {
       if (options_[k].getType() == FormatOption::OPTboundedInt) {
         int value = static_cast<QSpinBox*>(fields_[k])->value();
         value = qMax(qMin(value, options_[k].getMaxValue().toInt()),options_[k].getMinValue().toInt());

diff --git a/gui/processwait.cc b/gui/processwait.cc
index 3dc8a650958e1f6faa0a1fe905e59b8e0b2f4d5d..19b02708882bf0fde496440777b992dd45cf1b00 100644 (file)
--- a/gui/processwait.cc
+++ b/gui/processwait.cc
@@ -186,7 +186,7 @@ void ProcessWaitDialog::finishedX(int exitCode, QProcess::ExitStatus es)
 void ProcessWaitDialog::appendToText(const char* ptr)
 {
   outputString_ += QString(ptr);
-  for (const char* cptr = ptr; *cptr; cptr++) {
+  for (const char* cptr = ptr; *cptr != 0; cptr++) {
     if (*cptr == '\r') {
       continue;
     }

diff --git a/gui/serial_unix.cc b/gui/serial_unix.cc
index 1fb08db30396dfd222101bd4722e267643e82bd3..da8c39a0cfe8b231b776c6ddac82ee59d14c17a4 100644 (file)
--- a/gui/serial_unix.cc
+++ b/gui/serial_unix.cc
@@ -98,7 +98,7 @@ void MainWindow::osLoadDeviceNameCombos(QComboBox* box)
   const QStringList devices = dynamicDevices();
   box->addItems(devices);
 
-  for (int i=0; deviceNames[i]; i++) {
+  for (int i=0; deviceNames[i] != nullptr; i++) {
     if (!devices.contains(deviceNames[i])) {
       box->addItem(deviceNames[i]);
     }

diff --git a/gui/upgrade.cc b/gui/upgrade.cc
index 73909c85f1538e24ad4a150822bb966957cb351b..5dced128485a9b8d69db60905f3056eade58875d 100644 (file)
--- a/gui/upgrade.cc
+++ b/gui/upgrade.cc
@@ -60,11 +60,11 @@ UpgradeCheck::UpgradeCheck(QWidget* parent, QList<Format>& formatList,
 
 UpgradeCheck::~UpgradeCheck()
 {
-  if (replyId_) {
+  if (replyId_ != nullptr) {
     replyId_->abort();
     replyId_ = nullptr;
   }
-  if (manager_) {
+  if (manager_ != nullptr) {
     delete manager_;
     manager_ = nullptr;
   }
@@ -123,7 +123,7 @@ UpgradeCheck::updateStatus UpgradeCheck::checkForUpgrade(
   args += "&os=" + getOsName();
   args += "&cpu=" + getCpuArchitecture();
   args += "&os_ver=" + getOsVersion();
-  args += QString("&beta_ok=%1").arg(allowBeta);
+  args += QString("&beta_ok=%1").arg(static_cast<int>(allowBeta));
   args += "&lang=" + QLocale::languageToString(locale.language());
   args += "&last_checkin=" + lastCheckTime.toString(Qt::ISODate);
   args += QString("&ugcb=%1").arg(babelData_.upgradeCallbacks_);
@@ -139,14 +139,14 @@ UpgradeCheck::updateStatus UpgradeCheck::checkForUpgrade(
     int rc = formatList_[i].getReadUseCount();
     int wc = formatList_[i].getWriteUseCount();
     QString formatName = formatList_[i].getName();
-    if (rc) {
+    if (rc != 0) {
       args += QString("&uc%1=rd/%2/%3").arg(j++).arg(formatName).arg(rc);
     }
-    if (wc) {
+    if (wc != 0) {
       args += QString("&uc%1=wr/%2/%3").arg(j++).arg(formatName).arg(wc);
     }
   }
-  if (j && babelData_.reportStatistics_) {
+  if ((j != 0) && babelData_.reportStatistics_) {
     args += QString("&uc=%1").arg(j);
   }
 
@@ -282,7 +282,7 @@ void UpgradeCheck::httpRequestFinished(QNetworkReply* reply)
     }
   }
 
-  if (response.length()) {
+  if (response.length() != 0) {
     QMessageBox information;
     information.setWindowTitle(tr("Upgrade"));